Skip to content

fix(product-warranty-switch): Gate warranty enabling only (backport #6686)#6687

Closed
mergify[bot] wants to merge 1 commit into
masterfrom
mergify/bp/master/pr-6686
Closed

fix(product-warranty-switch): Gate warranty enabling only (backport #6686)#6687
mergify[bot] wants to merge 1 commit into
masterfrom
mergify/bp/master/pr-6686

Conversation

@mergify

@mergify mergify Bot commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

(cherry picked from commit 518365f)

# Conflicts:
#	press/api/site.py
@mergify mergify Bot requested a review from ssiyad as a code owner June 11, 2026 08:34
@mergify mergify Bot added the conflicts label Jun 11, 2026
@mergify

mergify Bot commented Jun 11, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 518365f has failed:

On branch mergify/bp/master/pr-6686
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit 518365fba.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   press/api/tests/test_site.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   press/api/site.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@greptile-apps

greptile-apps Bot commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

Target branch is in the excluded branches list.

@regdocs

regdocs commented Jun 11, 2026

Copy link
Copy Markdown
Member

cherry pick failed

@regdocs regdocs closed this Jun 11, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant